From 9a98cd8f8785b35e29a2b8a95b7d876c4726893d Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Wed, 4 Feb 2004 21:55:33 +0000 Subject: [PATCH] Fix #59707. 2004-02-04 Federico Mena Quintero Fix #59707. * gtk/gtklabel.c (gtk_label_focus): Removed, so we don't ignore the focus chain. (gtk_label_button_press): Fix prototype. (gtk_label_button_release): Likewise. (gtk_label_motion): Likewise. * tests/testgtk.c (create_message_dialog): For the dialog with only GTK_BUTTONS_CLOSE, make GTK_RESPONSE_CLOSE the default. --- ChangeLog | 13 +++++++++++++ ChangeLog.pre-2-10 | 13 +++++++++++++ ChangeLog.pre-2-4 | 13 +++++++++++++ ChangeLog.pre-2-6 | 13 +++++++++++++ ChangeLog.pre-2-8 | 13 +++++++++++++ gtk/gtklabel.c | 30 ++++++++++-------------------- tests/testgtk.c | 4 ++-- 7 files changed, 77 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index acc9cd291e..b060894778 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2004-02-04 Federico Mena Quintero + + Fix #59707. + + * gtk/gtklabel.c (gtk_label_focus): Removed, so we don't ignore + the focus chain. + (gtk_label_button_press): Fix prototype. + (gtk_label_button_release): Likewise. + (gtk_label_motion): Likewise. + + * tests/testgtk.c (create_message_dialog): For the dialog with + only GTK_BUTTONS_CLOSE, make GTK_RESPONSE_CLOSE the default. + 2004-02-04 Morten Welinder * gtk/gtktoolbar.c (show_menu): Show on the right screen. (Fixes diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index acc9cd291e..b060894778 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,16 @@ +2004-02-04 Federico Mena Quintero + + Fix #59707. + + * gtk/gtklabel.c (gtk_label_focus): Removed, so we don't ignore + the focus chain. + (gtk_label_button_press): Fix prototype. + (gtk_label_button_release): Likewise. + (gtk_label_motion): Likewise. + + * tests/testgtk.c (create_message_dialog): For the dialog with + only GTK_BUTTONS_CLOSE, make GTK_RESPONSE_CLOSE the default. + 2004-02-04 Morten Welinder * gtk/gtktoolbar.c (show_menu): Show on the right screen. (Fixes diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index acc9cd291e..b060894778 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,16 @@ +2004-02-04 Federico Mena Quintero + + Fix #59707. + + * gtk/gtklabel.c (gtk_label_focus): Removed, so we don't ignore + the focus chain. + (gtk_label_button_press): Fix prototype. + (gtk_label_button_release): Likewise. + (gtk_label_motion): Likewise. + + * tests/testgtk.c (create_message_dialog): For the dialog with + only GTK_BUTTONS_CLOSE, make GTK_RESPONSE_CLOSE the default. + 2004-02-04 Morten Welinder * gtk/gtktoolbar.c (show_menu): Show on the right screen. (Fixes diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index acc9cd291e..b060894778 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,16 @@ +2004-02-04 Federico Mena Quintero + + Fix #59707. + + * gtk/gtklabel.c (gtk_label_focus): Removed, so we don't ignore + the focus chain. + (gtk_label_button_press): Fix prototype. + (gtk_label_button_release): Likewise. + (gtk_label_motion): Likewise. + + * tests/testgtk.c (create_message_dialog): For the dialog with + only GTK_BUTTONS_CLOSE, make GTK_RESPONSE_CLOSE the default. + 2004-02-04 Morten Welinder * gtk/gtktoolbar.c (show_menu): Show on the right screen. (Fixes diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index acc9cd291e..b060894778 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,16 @@ +2004-02-04 Federico Mena Quintero + + Fix #59707. + + * gtk/gtklabel.c (gtk_label_focus): Removed, so we don't ignore + the focus chain. + (gtk_label_button_press): Fix prototype. + (gtk_label_button_release): Likewise. + (gtk_label_motion): Likewise. + + * tests/testgtk.c (create_message_dialog): For the dialog with + only GTK_BUTTONS_CLOSE, make GTK_RESPONSE_CLOSE the default. + 2004-02-04 Morten Welinder * gtk/gtktoolbar.c (show_menu): Show on the right screen. (Fixes diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c index b835c2a79d..24346724ca 100644 --- a/gtk/gtklabel.c +++ b/gtk/gtklabel.c @@ -102,12 +102,13 @@ static void gtk_label_realize (GtkWidget *widget); static void gtk_label_unrealize (GtkWidget *widget); static void gtk_label_map (GtkWidget *widget); static void gtk_label_unmap (GtkWidget *widget); -static gint gtk_label_button_press (GtkWidget *widget, - GdkEventButton *event); -static gint gtk_label_button_release (GtkWidget *widget, - GdkEventButton *event); -static gint gtk_label_motion (GtkWidget *widget, - GdkEventMotion *event); + +static gboolean gtk_label_button_press (GtkWidget *widget, + GdkEventButton *event); +static gboolean gtk_label_button_release (GtkWidget *widget, + GdkEventButton *event); +static gboolean gtk_label_motion (GtkWidget *widget, + GdkEventMotion *event); static void gtk_label_set_text_internal (GtkLabel *label, @@ -145,8 +146,6 @@ static gboolean gtk_label_mnemonic_activate (GtkWidget *widget, gboolean group_cycling); static void gtk_label_setup_mnemonic (GtkLabel *label, guint last_key); -static gboolean gtk_label_focus (GtkWidget *widget, - GtkDirectionType direction); /* For selectable lables: */ static void gtk_label_move_cursor (GtkLabel *label, @@ -248,7 +247,6 @@ gtk_label_class_init (GtkLabelClass *class) widget_class->hierarchy_changed = gtk_label_hierarchy_changed; widget_class->screen_changed = gtk_label_screen_changed; widget_class->mnemonic_activate = gtk_label_mnemonic_activate; - widget_class->focus = gtk_label_focus; class->move_cursor = gtk_label_move_cursor; class->copy_clipboard = gtk_label_copy_clipboard; @@ -2178,7 +2176,7 @@ gtk_label_select_word (GtkLabel *label) gtk_label_select_region_index (label, min, max); } -static gint +static gboolean gtk_label_button_press (GtkWidget *widget, GdkEventButton *event) { @@ -2257,7 +2255,7 @@ gtk_label_button_press (GtkWidget *widget, return FALSE; } -static gint +static gboolean gtk_label_button_release (GtkWidget *widget, GdkEventButton *event) @@ -2279,7 +2277,7 @@ gtk_label_button_release (GtkWidget *widget, return TRUE; } -static gint +static gboolean gtk_label_motion (GtkWidget *widget, GdkEventMotion *event) { @@ -2767,14 +2765,6 @@ gtk_label_get_use_underline (GtkLabel *label) return label->use_underline; } -static gboolean -gtk_label_focus (GtkWidget *widget, - GtkDirectionType direction) -{ - /* We never want to be in the tab chain */ - return FALSE; -} - /* Compute the X position for an offset that corresponds to the "more important * cursor position for that offset. We use this when trying to guess to which * end of the selection we should go to when the user hits the left or diff --git a/tests/testgtk.c b/tests/testgtk.c index 4044ab3578..8358d47d6d 100644 --- a/tests/testgtk.c +++ b/tests/testgtk.c @@ -4315,9 +4315,9 @@ create_message_dialog (GtkWidget *widget) GdkScreen *screen = gtk_widget_get_screen (widget); make_message_dialog (screen, &info, GTK_MESSAGE_INFO, GTK_BUTTONS_OK, GTK_RESPONSE_OK); - make_message_dialog (screen, &warning, GTK_MESSAGE_WARNING, GTK_BUTTONS_CLOSE, GTK_RESPONSE_OK); + make_message_dialog (screen, &warning, GTK_MESSAGE_WARNING, GTK_BUTTONS_CLOSE, GTK_RESPONSE_CLOSE); make_message_dialog (screen, &error, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK_CANCEL, GTK_RESPONSE_OK); - make_message_dialog (screen, &question, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, GTK_RESPONSE_YES); + make_message_dialog (screen, &question, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, GTK_RESPONSE_NO); } /* -- 2.30.2